Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / common / AdminInterface.java

diff --git a/ruralHouses client/src/common/AdminInterface.java b/ruralHouses client/src/common/AdminInterface.java
new file mode 100644 (file)
index 0000000..eb5e888
--- /dev/null
+++ b/ruralHouses client/src/common/AdminInterface.java
@@ -0,0 +1,34 @@
+package common;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.Vector;
+
+import domain.Account;
+import domain.RuralHouse;
+
+public interface AdminInterface extends Remote {
+
+       
+       public Vector<RuralHouse> getAdditionRequests() throws RemoteException;
+
+       public Vector<RuralHouse> getDeletionRequests() throws RemoteException ;
+
+       public Vector<Account> getOwnerAdditionRequests() throws RemoteException ;
+       
+       public void removeHouseAdditionRequests(RuralHouse house) throws RemoteException ;
+
+       public void removeHouseDeletionRequests(RuralHouse house) throws RemoteException ;
+       
+       public void removeOwnerAdditionRequests(Account acc) throws RemoteException ;
+       
+       public boolean addAdditionRequest(RuralHouse rh) throws RemoteException ;
+
+       public boolean addDeletionRequest(RuralHouse rh) throws RemoteException ;
+       
+       public boolean addAccount(Account acc) throws RemoteException ;
+       
+       public void saveInstance() throws RemoteException;
+       
+       
+}